merge emacs-24
authorKenichi Handa <handa@gnu.org>
Tue, 27 Nov 2012 13:02:06 +0000 (22:02 +0900)
committerKenichi Handa <handa@gnu.org>
Tue, 27 Nov 2012 13:02:06 +0000 (22:02 +0900)

Trivial merge